folder refactoring
merge branch 'master' of https://github.com/filoxo/IS543

Refactoring code folders.
Folder restructure