New file structure! Classes are in modules now.