integration refactoring

we can add module in each package, so like that the implemntations will be privete - this is not a problem