namespaces changed to restructured folder order