Rearrangement of directory structure
Changed directory structure to be more organised