Handlers
Rename layout to layouts
Externalize plugins
Fix images plugin