Added Trap type classes

Also fixed their namespaces