Full framework refactored. Classes renamed. Functions moved
Merge conflict