Restarted the whole project.

Things got messy.
Hopefully there's more structure now