Cleaned up util package by moving analysis related code into smaller analysis packages