Reorganized and added some example stuff