Converted more files to requirejs