Modifications torwards decouplable configuration.
More works torwards modularization.