[PATCH 2/2] Restructure sources