changed all to be modular conform to coding standars