Fixes for new modular approach

- admin_helper is bye bye. CI just doesn't like it
- corrected paths