Organize main class, more work with Tools