Fixing up folder structure