Renamed a class and cleaned up the website model creation