Refactored, as something could not work with a - in a project/module name