Restructured folders to be specifically variables and domains, and updated variables' value field to id