Eve in separate file and fixes for Move feature