Refactored package - dropped smc from project domain