[Kerry] refactor folder structure