Moved data classes back to Core folder and started the reworking of the classes.