Share 'genre types?'

OK, this is officially beginning to drive me kind of nuts. Are there officially recognized divisions within the mystery genre, and if so, what are they? I've heard of the following: * Traditional / cozy * Hardboiled / noir * Police procedural * Spy / espionage * Literary / psychological (do these belong together?) * Thriller (couldn't some of the other types also be thrillers?) * Historical * ...