This won't affect normal use of the client, other than it having a few extra unused classes and some additional lines in the manifest. Issue #750
This allows service entries to be included.
Makes it a bit less messy, and easier to find the right bits.