Improve file structure -- move classes to include files
>>> [!note] Migrated issue <!-- Drupal.org comment --> <!-- Migrated from issue #1642964. --> Reported by: [amitaibu](https://www.drupal.org/user/57511) >>> <p>patch coming.</p>
issue