Preliminary refactoring
Do preliminary package movements
Merge branch 'master' of https://github.com/cyber-waste/kuzoff into feature/rmi
Merge branch 'master' of https://github.com/cyber-waste/kuzoff into feature/rmi
Do global refactoring