fixing folder hierarchy