move distribution specific parts into the distribution