Removed circular reference with module requiring in all modules