Remove all atexit(done)
Move plugins back from unplugged directory
Selectively pick stuff from Claudio's experimental tree.