What a mess.  Moved everything into own subdir