Refactor file / folder structure