Fix script tags and move files accordingly