fix folders organization