JS Reorganization