Minor changes

Minor commit before a slight folder restructure