Cleaning it all up

Dropping the base role, moving most things to dev and cleaning up the pseudomuto role...