Reorganized the .java files in separate packages