Closed #21 and made some structure changes in build.xml