also tidying up the macro folder