[JS] - Restructure