Threw everything in one namespace

Cyclic dependencies causes me to throw everything in a single namespace.
This should be fixed but can't be bothered atm.