Reorganizing to help with libsass todo testing.