completed modularization details