Flattened the namespace by renaming and moving files.