reorganized JS includes