Major Refactoring of the Inspector Project