Feature/refactor

Biiiiiig refactoring - one bundle