Cleanup work

Renaming and organizing things.