Rewrote folder controller