Reviews part 1 + js re-organisation