Refactor all things. Adds more packages to better organize things.

My IDE did some things too. Idk