Added preliminary config & new structure