Reorganized imports and updated version