Restructed folders and fixed spinner