More renamings of at-specific tokens
Reorganized files so that paths and ruby namespaces are consistent.
Updated requires and dependencies