Changed some menu stuff around, moved files