Moved import scripts to right place