Added support for facets and minor project re-orgnaisation