Input classes and struct refactored