Begin cleanup of this module
More cleanup
Add standard file headers
Replace copyright msgs
More cleanup
Cosmetics