Relocate transition functions to correct files