Cleaned directory - Alex add waypoint expansion to a subdirectory