generic.py: deprecated, use the new layout