knowledge - The Wall of Walls

I present to you... The Wall of Walls!

\begin{matrix} \text{sniper} & \text{bauxite} & \text{marshmallow} & \text{viper} & \\ & \\ \text{sparrow} & \text{absolution} & \text{modernism} & \text{pigeon} & \\ & \\ \text{joplin} & \text{golden} & \text{earth} & \text{smaug} & \\ & \\ \text{sergeant} & \text{gala} & \text{inspector} & \text{square} & \\ & \\ \text{circle} & \text{donut} & \text{berlin} & \text{springfield} & \\ & \\ \text{pentagon} & \text{granite} & \text{sandstone} & \text{falkor} & \\ & \\ \text{oreo} & \text{negro} & \text{predator} & \text{smith} & \\ & \\ \text{graduate} & \text{captain} & \text{independence} & \text{scholar} & \\ & \\ \text{money} & \text{office} & \text{triangle} & \text{constable} & \\ & \\ \text{lollipop} & \text{fuji} & \text{shockwave} & \text{albatross} & \\ & \\ \text{acrobat} & \text{hunger} & \text{madeira} & \text{wailing} & \\ & \\ \text{python} & \text{boa} & \text{anaconda} & \text{flash} & \\ & \\ \text{silent} & \text{calendar} & \text{marble} & \text{resurrection} & \\ & \\ \text{pelican} & \text{norbert} & \text{malone} & \text{covenant} & \\ & \\ \text{drive} & \text{great} & \text{columbia} & \text{prometheus} & \\ & \\ \text{tocantins} & \text{putumayo} & \text{illustrator} & \text{viserion} & \\ & \\ \end{matrix}

You must sort these 64 words into 16 groups of 4 words. However, once you're finished with that, your mission is to build another wall with 16 new words, those words being the key word in each of those category names, and then solve it too!

For instance, if you grouped the words galaxy, kart, party and odyssey in a "words in the title of Mario videogames" category, you should use Mario as a word for the second wall (and maybe that would be part of the group "Nintendo characters" or "Names beginning with an M" in that wall). Don't worry, I think the word to be used for each category should be quite obvious (if it's the right group).

The only thing left to say is that only one of the words on the second wall is a plural. I clarify this because since you will be working with groups, the category names will probably be plural, so you should take this into account and use the singular form of the key word in all but one case.

Good luck!

Edit: Since the first Wall was pretty much solved, here is the 2nd wall, to avoid discrepancies:

post snake dragon android
rock amazon alien missouri
adobe police apple bird

google shape wall hitman

---

Although I've mentioned these in the comments, I'll add these here for clarification.

Hint 1:

The word that should be in plural in the second wall is very fitting.

Hint 2:

Stone instead of rock does work for the category I had in mind, but not as well.

Hint 3:

The first category for the second wall was already found. The tags for the remaining three are music, movies and entertainment.

Hint 4:

My other question on this site will pretty much tell you what one of the categories is (I made this before that one was solved, and I wanted someone to solve all of this first and then make the connection, but it didn't happen!)

Hint 5:

The words in another category are supposed to be preceded by "the" (unless you choose the alternative word in hint 2. That word is... cooler).

Answer

adobe: illustrator flash shockwave acrobat
google: calendar drive earth scholar
amazon: negro tocantins putumayo madeira (from @frogtown_j)
apple: golden gala fuji smith

These are all tech companies.

police: constable inspector sergeant captain

alien: covenant prometheus predator resurrection
android: marshmallow donut oreo lollipop (from @hexomino)
walls: berlin wailing great hunger (from @hexomino)

These are parts of song titles on Radiohead's OK Computer (thanks, hint 4): "Karma Police", "Subterranean Homesick Alien", "Paranoid Android", "Climbing Up the Walls".

shape: square circle triangle pentagon
bird: pelican albatross pigeon sparrow
post: malone office modernism graduate (from @FionaSapphire)
missouri: springfield joplin independence columbia (from @frogtown_j)

These are all parts of the titles of 2018 Best Picture Oscar candidates: "The Shape of Water", "Lady Bird", "The Post", "Three Billboards Outside Ebbing, Missouri".

snake: viper boa anaconda python
rock: granite sandstone marble bauxite
dragon: viserion smaug falkor norbert
hitman: silent money absolution sniper (from @frogtown_j)

These are all WrestleMania wrestlers: Jake "The Snake" Roberts, Dwayne "The Rock" Johnson, Ricky "The Dragon" Steamboat, Bret "Hitman" Hart.