Move dtables into separate folder again