move more files to controllers subdir
move more files to controllers subdir part2
explicitly import module.js before other filenames