Reorganize configuration to be future proof but also because I am ultra maniac