cleaning up the folder structure so that it can be toolized