improved autoloading
move clientscript