Added package config
some cleanups