Cleaned up code
Go away class files!