Reorganization, removal of files, addition of java files