Fix component folder
Fix script concat