Clean up relative imports and conflicts for publishing