Feature/1

Fixing the structure of code, #1