Making Org Suite Independent

this is redirected from https://github.com/flavour/eden/pull/930