fixed imports and module use