Organizational refactoring

Moved mod info to main class