Reorganize wrappers

Mostly messing around with possible wrappers and their corresponding compilation methods