site default module renamed because of switch default keyword conflict
+ small changes
+ ComponentManager changes to work with site module