refactoring of main objects placement