moved some files, done some stuff, need to redo CSession