re-organized, added json for composer