Moved files around.
Added :emitter to configuration
clean up requires