reorg, removing files to move them to separate directories in the next commit