Organized imports, removed old class