Feature/8 refactor app