Some organizing

sheesh this is tough