- Reorganization of file structure
- Managed to catch the Preferences' changes correctly