New commit with restructuring of code