Refactor config a bit

-- Move more variables into Config and use nested objects