clean up!

too many changes to list ...
But, mostly just moved component files out of the main directory.