Little bit of organizing (moved some code)...
Release 1.2.0