updated both files with new code organisation from JekyllTest