Switched to default maven structure