Switch to a more modulary way.
v0.2.0