--fork off distributions code to separate package