Refactor code / Add Network config initial setup