Minor changes to code; moved all .java files to src directory