Moved .java files to the correct folder