Refactored app.'s so that directives are organized.
No code was changed, just re-organized.