Moving out config... part 2... almost done