Use absolute imports, fix circular dependency