fixed style issues
Merge branch 'master' of https://github.com/Vivarana/FYP
Merge branch 'master' of https://github.com/Vivarana/FYP
refactored the code. Moved each file type to different extension package
fixed clustering and refactored the code