preparing for lib modularization