Minor files reorganisation [ci skip].