Better structure

Cleaner and easier to maintain.
Exactly, haha. Should be resolved now!