Consolidated directive views and styles.
Tailored grunt file to new structure.