made several to file organization and performed a lot of cleanup per fee...

...dback from Cam