Add version output, reorganise some files