refactor names and folders