Change to meet PSR-4. Create plugin for chosen