reorganize macaulay scripts