Moved DataCreator and sub classes into separate files and fix run time errors