Added folders to organize different views