#gjmsdev - Moved users to module 'core'.