Prep/refactor rename

Moved a bunch of files around, removed deprecated items. Prepping for version 1.0 which is going to be awesome of course.