Added folder structure change and some output