Cleanup and Renaming Main Class

Done to prevent ModLoader Errors