Force separation of content and design
More cleanup
Add generate step and debug dir