Refactor deps into new folder