Renaming some files to better indicate their contents
Also the new build.xml file works just fine