Refactored the inter-modules dependencies.