Rival: changed folder structure (added rival- to each module)