changed files per reorg and broke out some stuff into partials/directives