change calculator container name
add lamp structure
add clock structure