Moving folders to ease search/replace
Improve EventEmitter