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

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

adding style sheets
renaming
reformating code