Changed namespaces to match file structure

We had quite a few issues with file cases as the namespace didn't match the folder paths. The attached commit fixes all the problems that we encountered on multiple case sensitive filesystems