Moved Package.todo handling in one place. Fixed a situation when path to a file that doesn't exist is passed to Package
