Major update and restructure

EVERY THING IS CHANGED NOW