Sorting packages, removing incorrect imports and improving setuptools stuf