fix to mvn war build. und re-structuring of directories.