Deleted files, re-did some old code.
Intermediate commit

No real changes, just deleted the annoying extra folder of master -_-