Re worked config loading classes