make compilable on Mac
restructure directory
Merge fantasia.sph.umich.edu:~/rvtests.dev
further clean code