Now really solve circular imports
Add some redirects, move code around