move files into lib / test dirs