Cleanup

Renaming and reorganizing