Organized imports. Removed unneeded classes