Revert "Merge pull request #233 from tyteen4a03/master"

The said commit messed up organization and grouping of imports in most files, and introduced the frowned-upon practice of wildcard import.

This reverts commit 1521989226a22b383e8935545b14596db23cd4cf, reversing
changes made to acfb873849962804d9893d21b79eaf42b8ae40d7.