Said plan shall include planning to improve and maintain facilities and equipment for all modes of transportation in the Commonwealth, including highways and roads, passenger rail and other public transportation, freight rail, aviation, shipping, pedestrian facilities, bicycle facilities, and water transportation.