RPF-2: new project structure for cleaner builds