change structure + remove fixed paths