Moved all the attributes into their own namespace