consolidated light over scripts
reorganized js