Removed empty directories, removed inclusive search