creator code restructured