clean up

Renamed folders and removed test code