Adjusted module and function layout to best practice.