fixing folder organization