v0.2.6_(1054)_houseclean [8]

- code movement