move some stuff; rename project