Now I moved it and also changed all imports in all files. The solution above did not work because of circular imports.

Now done.