cleanup old files
Cleanup and organize files.
Rename and a bit of docs.
Remove old files
Split off utilty method into their own class.
Major refactoring -- streamline classes with more inherited code.