Moved some files

moved files, added variable for dir location