Refactor entire project

Deleted old/unused classes and xml files. Renamed files to appropriate
java class/xml names