reorganized and got rid of .class files