Changed namespaces/folder structure