Module Refactoring - Part #2 Build Core Package