Moved files from jekyll base into base folder, changed permalinks