Restructured and separate module logic from core application framework.