Restructure, added analog clock