Reorganize File Structure
Merge branch 'master' of https://github.com/j-dasilva/se1-project