Organized imports, added serialversionuid, etc