separating a little bit some things
removed modules from here