Rearranging project
Merge pull request #20 from dubdabasoduba/feature/EMR-6

Rearranging project