moving factory(services) and directive into single js files
Merge remote-tracking branch 'origin/master'