[PATCH 4/5] Restructure sources