Revert "created new branch"
Merge pull request #374 from FCP-INDI/revert-373-refactoring

Revert "created new branch"