Renamed classes and moved files around
Code Cleanup