Moving Acceptor to own sub-package
Optimizing imports