* Renamed some incorrectly named folders/namespaces