Updating examples
Cleaning up core components