Move content from r2ddi one level up, close #27