Changes in project structure to please Maven