Changed layout of project and rewrote build.xml