Move trk2 into its own little package