Moved files, added better data parser (only for data wich requires columns), added data mapper