Some Fixes to Structure + Updated to 1.5.2

A lot of the logic is screwed up in the code, will fix asap.