Fixing directories
Still fixing directories