Changed directory location

Also started using getdirectory for makedirectory