Added all the actions, refactored some of the namespaces