Better structure

Cleaner and easier to maintain.
Hm, I felt like it was incorrectly named. Maybe it is now, lol.