apoch Complete the reorganization of scenario rendering code - fixes #55