Modified arrays, cleaned directory