Updated methods to all be private and fixed pkg collision