Moved directory names to attrs