Get rid of coffee and make a more manageable structure