move normalize and general to more specific files/locations