[GDEF] Move more code
2 files changed