Refactored complex templates into Angular directives
Refactored complex templates into Angular directives (real commit)