minor clean up changes
updating files clean up and reorg
trying again