Update package to not be terribly organized & to have minimal version constraints