Merge in servius
Flatten directory structure