Code cleanup, moved packages around. Added track 30 sec preview capability