Integrated Ingredients DAO and GUI.  Cleaned up packages and folder structure