Fixing folder hierarchy