Deleted old classes and moved one that will be required later