V0.1.2

modularizing