repository directory reorganisation & name changes