refactor
added modules, settings