Changed structure to prototype structure + put commit in own file