Restructured folders and renamed variables and elements.