refactoring of Ingest.scala, moved each type to own scala file, added logging to Ingest at least, general fixes