Reorganized JS source