full rename and js reorganization