v0.2.6_(1054)_houseclean [9]

- code movement
v0.2.6_(1054)_houseclean [9]

- merge