Removed empty project
Renamed things to be more representative
Updated class names to new location