[MOD]: started modularization