Using new structure

Integrated merge conflicts, now using the structure in sketch-framer-3