Display emulator moved to 2D model
Small hierarchy refactoring
Fixed previous commit