Restructuring RPG directory