moving lots of stuff into 'base/' subdirs