intial refactoring of press package completed