Putting services, directives, filters into one module

Also updated unit tests. In response to issue #84