refactor code folder structure