move stuff around to accomodate simple build system
fix rc and a few other things