reorganize files into sensible directory structure