feat(css): change css dir
feat(js): merge branch