Organize files. Try to fix menu