Changed the layout to build with Maven