Organized

oh hey, I organized your stuff. want to pull my branch?