1. The new `core` modules just making the extension hard to follow for reviewers. 2. Better to use `connectObject()` and `disconnectObject()` for easier cleanup instead of holding the signals in a variable. 3. The reason for using `session-modes` should be mentioned in disable comment: [EGO Review Guidelines: Session Modes](https://gjs.guide/extensions/review-guidelines/review-guidelines.html#session-modes)

Thanks for your review! 1. Since most modules were just moved into the directory and remained unchanged otherwise, I assume you're talking about the new `ExtensionFeatureManager`. However, I believe that without this class the code will be harder to maintain and review, since basically every feature would need to re-implement the same functionality for enabling/disabling it depending on overall extension state, settings, and sessionModes. Also, this module will only rarely need changes, so when it's properly reviewed once, it'll not cause much more work in the future. If you could specify what exactly might make reviewing hard, that might be helpful. Otherwise, I could do some minor cleanup to make things more clear – e.g. rename `features` to `enabledFeatures`, add clarifying comments, reorder methods where it makes sense, so reviewing is eased a little. Would that work for you? 2. Sure, I'll refactor this. 3. Thanks, I missed that. Would this comment work or are there any more requirements? /* This extension requires the "unlock-dialog" session mode, since some feature also support running on the lockscreen (see the `sessionModes` parameter of `TouchUpExtension.defineFeature`). Currently, it's these features specifically: - DoubleClickToSleep: Supports double tapping the `ScreenShield` to suspend the device */

You can keep the comment small and easier to read. Something like: ``` Session Modes: This extension uses "unlock-dialog" session mode for some lock screen features: - DoubleClickToSleep: Double tap `ScreenShield` to suspend ```