Added site2
Created Extra and Package classes