Moved general params to package_ added references to common resources (?)