Restructures things a bit