Revert last commit and set correct sub paths in DataHandler (#151)