Organize the source files
Merge branch 'develop' of https://github.com/halitalptekin/safran-cli into develop