Reorganize collection & move tools for saperate dir