Valera
Reafactoring, removed view
Structure of files