fix imports and paths