Refactored Canvas class -> Screen with inner class Canvas

Signed-off-by: logineimer <logineimer@googlemail.com>