solved substring and moved everything into individual folders