Added the main java files and main .xml files to the commit
Added the rest of the files not in the commit