Moved hashmap / added fileexists check #28