Changing structure, naming convention etc.
This will likely break a load of stuff