Remove Site#getPageByUrl. Use Page#get(url) instead.
Rename Site#getTemplateUri to Site#getTemplateDirectory.