Clean up markdown and restructure