Move classes to not meddle with config
Make public send