Gentle refactoring of modules and bootstrapper