reordering of moduels
Refactoring: new folder for uui and model