up to date with refactorings; current module was removed