Merge pull request #14 from jangahroo/master

(refactor) wired up collections and updated directive
wired up more services