rework src tree