Changes to improve development environment and packaging