restructure directory.  Separate basic one-offs from the rest