folder restructure me happy now