renamed directories
renamed namespaces within files
renamed plist to pstream