Creating codelets + general rearrangements