First pass at removing org.spout.api.Spout references