Restructure directories to add settings and add some settings son