Revision

Cleaned up namespaces, removed ActionType field from Action because it
encourages bad programming practice.