Organized imports, following package naming conventions, Fixes #