More reorganization

clean me seymour