Move and delete classes
Clean up