deckarep Refactor to use multiple files.