Refactoring some classes and start attempting to make the serialization to map between naming conventions