Merging 1.0 and 1.2
Restructured + error
Fixed rename
Fixed imports
ClearCase testing in the new model
Added missing files