Revert "Reorganized imports and updated version"

This reverts commit 6b7c44c1d357e083fed9dd5dafb12ed29ab36b16.