[JS] - Complete restructure