Fixing up dir structure.