move to a cleaner package control format