one more restructure to simplify folders