Input classes and struct refactored
Merge branch 'refactoring/input' into develop