[TASK][WIP] Move non class code back to source files
drwxr-xr-x - typo3