Added the edn files and cleaned up the loading of those edn files