.src refactorings