[RP] Directory structure update