Improve folder structure and add new variables