Moved some more stuff around in the makefile and some name changes
Added some recursive name fetching to namespaces