File rearranging

Too many darn files.  Put into proper directories.