Feature/mod config

Created new feature branch ModConfig to work on tasks 5610 and 5611. This branch contains the changes for both tasks 5610 and 5611