Restructuring commit 2