Cleaned up path building. Renamed beginning to base.