#22 modify controller
#22 split spec files