Changed modular organization