Reorganizing to get rid of class files