With the country creator, will the unit creator be inside it or it will be a seperate modding tool?

They will probably be separate, as to allow units to be edited for existing nations or custom new ones.