Fixed JSONUtil missing package awareness, fixed missing packages in layout