re integration of saijs core
modulearization
modularization 2
modularization 4
still working on modularization