Many Changes on structiure and ccs files