Changed the way namespaces are structured throughout