made several to file organization and performed a lot of cleanup per feedback from Cam