move things to different subdirs. make tests pass.