Update file & folder structure to match new DUB structure