Remove Modularization

Unfortunately have to remove modularization. Caused errors. Need to
study more.

PS: Damn cache! Couldn't even tell the issue in previous build. -1: