minor restructuring for RForge