Revert "Combined PacketIds into layouts.h"

This reverts commit feb13f37a9e4688b3373d0187b01a0d807496d17.
Revert "Revert "Combined PacketIds into layouts.h""

This reverts commit 4e3f3ae25041c9393b5c861bde764811bc401e55.
Fixed compilation issue