Added folder strcuture