#2 reorgonize js structure
#2 change js structure