Started rewrite off folder reading