Moved files around for better organisation.
Begun the path to a unified SiteList class