Cleaned up Code

Renamed a file and other cosmetic things