[TASK] Refactor code to match new structure
drwxr-xr-x - typo3