Reorganized GUI folders