Fixes #302. Adds ability to nest controllers and services in plugin directory