Changed project file layout to Maven conventions and amended the build.xml accordingly