added nivo, restructure file tree