Refactoring setup for modman