Refactor ad cleaned up the contents of the path and timer packages