Add missing files, fix ordering, namespaces