Package refactoring and add 'devMode'