Moved more forms over to digestive-functors and separated files more