Refactored last PR, fixed a path prefixing bug
Updated changelog