Refactored more structures into own classes and files from main.cpp