Fix some folder errors in bootstrap