Renamed Folders for better eclipse importing.