Removed redeclaration of constants
Updated paths
Updated paths
More paths fixed
Merge branch 'feature/fixing-paths' into develop