FIX: Namespaces were broken because of the folder rename.