refactoring; moved bconstraint cases into seperate folder