rearranged dynamo modules