folder structure refactor