Our current directory structure contains a lot of echos from when the project was built with Maven. We could restructure things in 4.0.x