some changes before moving classes
changes to project structure for future HMI usage