Switched to a maven structure