Move scripts files around once more
Improve compatibility for __{define,lookup}[G|S]etter__
Rename test for surefire