Started working on reorganization
Merge branch 'master' of https://github.com/ganymedes01/TheErebus