Migrated config to separate file
Modularised