move some files, rethinking structure