Modules rearranged, AStar working