reorganize zones directory
work toward simpler entity hierarchy