Second try of adding folders and everything