Merge "Refactor distribution module to application."