clean up

removing old code and moving to correct files