Change JS structure