New file structure and added comments to basic_proto