Started moving classes over to new package, also fixed staffchat and recreated a few classes.