Modularization

shape