Moved shape tools into their own folder inside tools