RPF-2: improved project structure