refactor Module collection attributes
manager almost working
refactored Router to work with new ModuleManager
messing arround with some tests