Reorganised tools folder