Cleaned up build.xml and changed it to match new package hierarchy