Move some stuff around, add YUI boiler