specialty and work module / additional refactoring for Firefox nag bug

Signed-off-by: scottsavarie@gmail.com <158brunnenstrasse>