adding some files missed in earler commits
further cleanup of files