Cleanup of landing pages, move non-entities out of entity directory