[14] Refactoring application layout, merging with code base and into common Maven parents with reformatting / cleanup