Reorganize lib for Underbar tests