Have done some re-organising of where the functions are in utils.py -…

… now the only thing left to do with this is to move the directory creation stuff to BaseSource init, and make sure the re-written setup process is all comptaible with what has gone before