Reorganised partials and directives markup to be under a single 'inc' directory