zGuilds Reorganizational Commit #2