Fixed package config, and updated to PSR2