Refactor folder structure and use Thor