Moving into a more maven structure