Made Some Changes

Now more organised