Move some files around

Signed-off-by: Oren Leiman <oleiman@ucsc.edu>