Refactoring to resemble packer's own package structure