component restructuring, template dependancies.  prepping components for directive refactoring