Refactored package names

So to not clash with original mod