Move the data repository to a simpler location, robustify some code.