Feature/modules integration

pull request for feature/modules_integration (includes feature/tests)