Merge branch 'hotfix/post-updates'
Cleanup _posts with subfolders
Merge branch 'hotfix/organize-posts' into develop