Sergey/application structure chore