Remove duplicated directory
UI improved