convert Figure away from module pattern. #11