Re-factoring the package to make it more appropriate