Refactored

Signed-off-by: ivanalayan <ivan.alayan@orangeandbronze.com>
move to new location

Signed-off-by: ivanalayan <ivan.alayan@orangeandbronze.com>
newly commited

Signed-off-by: ivanalayan <ivan.alayan@orangeandbronze.com>
Merge branch 'development-branch'