Moved tf items into their own file