Changed back to hierarchical maven layout