regroup functions into related areas
cleanup