moving some config
moving around the code