REFACTOR Change sctructure of paths