diversity tables, reorganized directories- will finish the rest soon