Fix layer model serialize method to use new organization