Add "archive" section. Re-organize includes and layouts