Deleted old classes and organized imports