Fixed lots of classes, cleaned the folder structure, etc