Moved almost everything from conf to etc