Merged Terrain Control into Main Package