Refactored package names and modified ai and RCs