Fixed import paths for public release