isSquare folder restructure