Removed Whitelabel references from some namespaces
Renamed folders