Second commit plus housekeeping
Kept house regarding old, superfluous files
More housecleaning