Fixed issues after files rearrange.