Updates

Merged CIP codes - new folder structure