more reorganization
more rearranging
finished splitting into modules
Add beans.xml so these classes can be injected