Maven structure refactoring

The old file-structure did not comply with the default maven file-structure, without any valid reason. This pull request fixes that inconsistency.