Refactored Terrain names, unused files cleanup