Fixed maven file structure