redoing archive implementation
move content to entity namespace