Refactor markup to have a proper outline
Move to markdown format with layouts