Major structural refactor
layouts/ renamed to templates
core/