Renamed some types and associated files
Clean site data; progress sitedata definitions of enum eration types (incomplete)