rearranging yaml and tm