Added types into common.types and added site support.
Merge ../commons