refactored project structure
switched back to $watch from custom event
Merge pull request #9 from torifat/master

refactored project structure