Move decorators into package. Repair coroutine wrapper