DIVERBEVAN-46 Completed Upload feature, tidied up config loading feature