more clean up and re-org of files