Changed layout to to follow a little closer Maven convetions