src refractoring to build