Fixed maven structure and added package.