- split static interface into its own module
- additional reorganization of classes, etc