files move now neato
working packager w00t
merge and up
cleanup