cleanup in src directory

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