Fixing folder structure from the previous commit