Merge pull request #35 from sandyphan/master

Organised files into folders as later will have more files, the folder will get too messy