Removed @Service annotation, and the need for it. Now @Inject can be used alone.
Changes to try to get ui addon to work.
Organized imports