Controllers split to separate file, moved js linkage to bottom of file