move tracks into their own subpackage