Internal refactor, load of installed modules