refactor folder etc