Removing all classes, going to put them into main file
Started class definitions in main file. Removed most loop code for now.