Removed unnecessary classes and rearranged base analyzers