Added proto/ subdirectories under major directories so that dependent files can inherit only protos