Deleted and moved factory files