Source formatting. Making code more modular.
Source formatting. Making code more modular.

Relates to #305.

dustinryerson/gh,dustinryerson/gh,henvic/gh,tomzx/gh,modulexcite/gh,oouyang/gh,oouyang/gh,tomzx/gh,TomzxForks/gh,henvic/gh,modulexcite/gh,TomzxForks/gh