Removed some silly folder.
Renamed folder to stick with namespace naming.