File restructure to simplify build.xml + dev environment