updates to clean up file names and document

~~Not ready for merge.~~ @wasade and @antgonza, can you review?