cleaned up classes, file structure, etc