fixed a direction error and moved service2 to service.
dont commit unfinished features.
Merge pull request #2 from graham/master

Merge