Moved all files to new package, hashMap