Restructured modules to suit relative imports