Move some stuff into legacy folder to delete later