package handler refactor complete

everything removed under todo in change log is complete