reorganize code
0.2.4