Migrated more of the code over to using Jetty. I focused on getting the interfaces corrected for Jetty type structure.