- Fixing existing extensions
- Reorganization for clarity sake