optiized imports and updated build script