directory shuffle

slightly reshuffled file hierarchy to be more consistent
accounted for directory change

changed dataloader.py to account for new file structure