Re: [PATCH 3/3] Restructure sources