Move tracks to tracks/

@blucia0a can you pull this branch and test