Move layout to own generator + refactor default site generator