refactor the folder structure