Refactor modules to avoir injecting them into all classes