js/jQuery reorganized, work on ergonomic