Math revised

revice math
modularize 01

Most of the components are modulrized