Decoupling

Decoupled things
Fixed some stuff

But still no sprite drawing