Restructring folder-structure