Change directory structure
Changes to directory structure revisited