Moved tools into tools module
Implemented unit tests