Refactored Websites plugin and installer