first pass at site reorganization