Cleaned up configuration and added packages.