Move some files around, import joda time
Improve the handling of stop events