Refactor folder location