fix: relative imports, other changes