Fix no attribute encoderResolution
New folder organization
Merge remote-tracking branch 'origin/develop' into develop