moved files into test and lib directories