changes to make code more readable, have fewer files up