Adding a first working version of folders