Feature/805 project structure

Missing  `var` creates a global variable