cleanup

Updated naming, documentation and moved sandbox-y non-production code to
sandbox\. Good for reference.