Changed to js AMD modules part 1