Things tidied up, along with how dependencies get loaded