complete restructuring and modularization