Refactor maven structure