Refactored to include 'core' and 'restexpress' modules.